Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/PluginSDK/ModelFeature.cs | 4 | 3 | 147 | 26 | -- | 2 | SM |
/PluginSDK/ConfigurationLoader.cs | 5 | 2 | 46 | 30 | -- | 0 | SM |
/PluginSDK/ImageStore.cs | 1 | 0 | 50 | 0 | -- | 0 | SM |
/WorldWindow/WorldWindow.cs | 2 | 2 | 80 | 80 | -- | 0 | SM |
/PluginSDK/QuadTileSet.cs | 2 | 15 | 1579 | 844 | -- | 0 | UM |
/PluginSDK/QuadTile.cs | 7 | 11 | 1093 | 1079 | -- | 0 | UM |
/PluginSDK/WorldSettings.cs | 1 | 23 | 1994 | 402 | -- | 75 | UM |
/PluginSDK/World.cs | 2 | 30 | 2643 | 1987 | -- | 0 | UM |
/WorldWind/WorldWind.cs | 17 | 19 | 1270 | 1211 | -- | 0 | UM |